Update Debian config and scripts for cargo 0.16

diff --git a/debian/gbp.conf b/debian/gbp.conf
index c16083c70301497da7056aa8868345ce382f0719..cbdd2d0602b2a65ffab96d9eaadf5cf8873cea80 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -7,3 +7,7 @@ debian-branch = debian/sid
 
 [buildpackage]
 submodules = True
+
+[import-orig]
+upstream-vcs-tag = %(version)s
+component = deps

diff --git a/debian/make_orig_multi.sh b/debian/make_orig_multi.sh
index 2df1b45ffd9fb65196ff64724022f14f6c52b222..53333839d5fcddd60b9c456a0f6c8ccbc261db46 100755 (executable)
--- a/debian/make_orig_multi.sh
+++ b/debian/make_orig_multi.sh
@@ -45,7 +45,7 @@ export GIT_AUTHOR_NAME="deb-build"
 export GIT_AUTHOR_EMAIL="<>"
 export GIT_COMMITTER_NAME="${GIT_AUTHOR_NAME}"
 export GIT_COMMITTER_EMAIL="${GIT_AUTHOR_EMAIL}"
-cargo vendor --verbose
+cargo vendor --verbose deps
 
 # Unpack artifacts and clean embedded libs
 ${WORKDIR}/debian/cargo-vendor-unpack.py

diff --git a/debian/patches/clean-cargo-deps.patch b/debian/patches/clean-cargo-deps.patch
index 0326e7f9b36f7072633b8fef438e1c0a040ccce0..01d801a28d27806794cc832dfda644be12003d41 100644 (file)
--- a/debian/patches/clean-cargo-deps.patch
+++ b/debian/patches/clean-cargo-deps.patch
@@ -14,7 +14,7 @@ Index: cargo/Cargo.toml
  [dependencies]
 -advapi32-sys = "0.2"
 +#advapi32-sys = "0.2"
- crates-io = { path = "src/crates-io", version = "0.4" }
+ crates-io = { path = "src/crates-io", version = "0.5" }
  crossbeam = "0.2"
  curl = "0.4"
 @@ -29,7 +29,7 @@